Fix rdmsrl() for x86_32 -- high 32 bits must be cast to

u64 before shifting left.

Signed-off-by: Avi Kivity <avi@qumranet.com>

diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h
index f9a07e4791017c48eea74a8f6616d7ecaaf97f90..3c1e8fb6ba3ffc0af454462c85c050e83ab8f87b 100644 (file)
--- a/xen/include/asm-x86/msr.h
+++ b/xen/include/asm-x86/msr.h
@@ -12,7 +12,7 @@
        __asm__ __volatile__("rdmsr" \
                            : "=a" (a__), "=d" (b__) \
                            : "c" (msr)); \
-       val = a__ | (b__<<32); \
+       val = a__ | ((u64)b__<<32); \
 } while(0); 
 
 #define wrmsr(msr,val1,val2) \